merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Thu, 24 Apr 2008 20:08:29 +0000 (14:08 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Thu, 24 Apr 2008 20:08:29 +0000 (14:08 -0600)

Trivial merge